From: Giovanni Campagna <gcampagna@src.gnome.org>
Date: Fri, 18 Feb 2011 15:15:35 +0000 (+0100)
Subject: A11yStatus: fix resetting the GTK and icon themes
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~8923
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a4d3a57a1cb79209f8e2c7b4e777542d74b5ae12;p=gnome-shell.git

A11yStatus: fix resetting the GTK and icon themes

If the Shell is started with HighContrast enabled, it will never
see another value for the GSettings keys. In that case, we just
reset to the default.

https://bugzilla.gnome.org/show_bug.cgi?id=642641
---

diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index b5b6cdbe1..af503706f 100644
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -168,9 +168,12 @@ ATIndicator.prototype = {
                 if (enabled) {
                     settings.set_string(KEY_GTK_THEME, HIGH_CONTRAST_THEME);
                     settings.set_string(KEY_ICON_THEME, HIGH_CONTRAST_THEME);
-                } else {
+                } else if(!hasHC) {
                     settings.set_string(KEY_GTK_THEME, gtkTheme);
                     settings.set_string(KEY_ICON_THEME, iconTheme);
+                } else {
+                    settings.reset(KEY_GTK_THEME);
+                    settings.reset(KEY_ICON_THEME);
                 }
             });
         settings.connect('changed::' + KEY_GTK_THEME, function() {